Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 7 Dec 2005 11:44:02 +0000 (11:44 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 7 Dec 2005 11:44:02 +0000 (11:44 +0000)
commitd688d94c83260895444274b403545a4fedc0fe47
treeabb29bf44ef8aa011aef917395e30a5877cf36e2
parenta4de9a218c4d2bda6646bb296730f67e099f9e98
parent2fd63647b40f87281eca6878eebeeac889b7d3e1
Merged.